From 26d77199f89e6bca0376bc5beae3f53e5da85ef6 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Tue, 22 Jun 2010 07:19:16 +0100 Subject: [PATCH] x86 shadow: Fix x86_32 build. Signed-off-by: Keir Fraser --- xen/arch/x86/mm/shadow/multi.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 269ca887f4..3ae858c505 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -4671,7 +4671,7 @@ static void sh_pagetable_dying(struct vcpu *v, paddr_t gpa) paddr_t gcr3 = 0; mfn_t smfn, gmfn; p2m_type_t p2mt; - unsigned long gl3pa; + char *gl3pa = NULL; guest_l3e_t *gl3e = NULL; paddr_t gl2a = 0; @@ -4685,13 +4685,14 @@ static void sh_pagetable_dying(struct vcpu *v, paddr_t gpa) gmfn = gfn_to_mfn_query(v->domain, _gfn(gpa >> PAGE_SHIFT), &p2mt); if ( !mfn_valid(gmfn) || !p2m_is_ram(p2mt) ) { - printk(XENLOG_DEBUG "sh_pagetable_dying: gpa not valid %lx\n", gpa); + printk(XENLOG_DEBUG "sh_pagetable_dying: gpa not valid %"PRIpaddr"\n", + gpa); goto out; } if ( !fast_path ) { - gl3pa = (unsigned long) sh_map_domain_page(gmfn); - gl3e = (guest_l3e_t *) (gl3pa + (gpa & ~PAGE_MASK)); + gl3pa = sh_map_domain_page(gmfn); + gl3e = (guest_l3e_t *)(gl3pa + ((unsigned long)gpa & ~PAGE_MASK)); } for ( i = 0; i < 4; i++ ) { -- 2.30.2